merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Wed, 11 Apr 2007 13:30:02 +0000 (07:30 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 11 Apr 2007 13:30:02 +0000 (07:30 -0600)
commitec0addc57fefcefa73286b5e95e8bf0a354aea97
tree132e8525d4d0f862c9d0601a124d39d0fc220b03
parent193ed84021e60de3b41ab4665730ed45561c24e0
parent38ad8d2a5cddeaa0204616d1fd7766a818b8d539
merge with xen-unstable.hg